Build fixes for olad