Fixing derby upgrades 1 and 2