Minor fixes

Preparing for migration from item as class to gameobject script