Fix for asset manager and EL-Finder