Fixed forms and merged upgrades addon