Logical fixes.

Stupid mistakes, that I left behind during updates!