fixes for new default company