Fix little things...