Fixed build failures