More fixes to pre cursor