Some little fixes and optimizations for assets manager