Cleanup and fixup