Fixed build isssues.