Fix assetloader bugs