Some buildfile fixes.