beta upgrader fixes