fixed some issues with asset management