Tweaks in preparation for asset store submission