Fixed some minor Bugs
Merge branch 'refs/heads/feature/AssetsManagerImprovements' into develop