Fixing up some stuff