Build Fixes and shit

Various fixes for the build/s