Improvements to the ISPP FindFirst example