Fixed build problems