Fix little oversights