Minor bugfixes
Somehow GIT lost track of this file