fixes for customer project