Fix various bugs in CCG import (relates to OE-3178)