Fix ModelReader / MapReader Bugs