Some fixes for assets management