Fixes for NSPSUPPORT-181 and NSPSUPPORT-182