Fixed build-errors