Fixing up last minute things