* Build fixes