Fix fixits