UI and warning fixes