Fixing up some stuff before heading home