Fixes for unit cannon and adv vehicle fabber