Added warning fixes for Sean McBride