Fixing up some things.