Build fixes for stub