Fix fixits.