Buildfile fixes