Improvements to Assets\Manager [ci skip]