fix a whole slew of path and username differences