Fixed some cleanup items