Fix some wrongs