Fixing code review thingies. Need to catch flight.