I AM DIE: More minor fixes

Few more minor fixes to controller issues a few people have been having :)