selective upgrade option + ref update fixes