Feature #4977: Fix some AssetsManager issues