Various fixes from Scott's Laundry List
More minor fixes