Fix two issues with previous commit where we didn't even enter the new code path.