Fixes for asset import