34: Mostly build changes