More build housekeeping