Removed wrong user, bux fixes