Apply fixes requested by Wild Bill