Fix some build errors. Gonna break it later again anyway :D