fix CR issues