Use a typedef to specify the pointer type
Also fixed some issues with the MergedFileSystem