Follow up to previous commit
Fix some really stupid mistakes.