Small but important build changes