FIX THINGS!

Closes #768