Fixing up some good things