More notice and warning fixes