Trollskog: Small bugs, small fixes

This patch fixes an issue related to building inventories being cleared after upgrades.