CR feedback and warning fixes