committed Sean McBride's warning fixes