Minor improvements to nape integration.