Fixing up some stuff.