Started fixing several bugs related to AssetManager