more simple options fixes to upgrader