Fixing up some mess