Fixing up miscellaneous things.