Fix issues with remapper