Fixed bugs relating to economy