Build fixes WITHOUT_ACCOUNTING