Fixing the other stuff