More build fixes, everyone loves pch