Build fixes attempt 1