Build fixes only