Fixing up last tidbits