fixes for CR issues