Add cleanups and fixups