fixes on diff import