Cleanup and fixery.