DrawableManager Fixes