Cleanup and fixups