Update

Fixes to not break build, Max please code in Visual Studio :/ this is
becoming a pain the in ass :p