More buildfile fixes