[PATCHES] Fixes for assetloading