Fix some Compile Errors

Git for some reason cherry picked sebastion

This commit fixes some compile errors but this is all Im doing for tonight as I'm tired af. Thanks @tbalden & @Sportsstar89 for nice references