Tweaks to assets, controllers