Fixed some silly issues.

Accidentally must have copied some template logic from a another project on my pc... oops