Fixing up everything