Fixed some cleanups