Fixing up last things