n1039a two remaining fixes