more bugfixes for grandparent commit