Fixed build errors?