Fix some conflicts with other plugins using map files