Some fixes for the asset manager