Fix tracking on several elements

Fixes #264 (closed)

Looks like I messed up the tracking on a few elements in !359 (merged). This rights my wrongs.