Moar Fixes :D

Just some more fixes and cleanups, nothing special.