Minor fixes, @Smithey is really crap at coding..