Allow admin org change, minor fixes