Slight improvements to nfindr99