Fixing weird build errors on fresh checkout