CR for Job #20049 - Leap - Some fixes to Leap

Code Review for Job #20049 - Workitem available at https://www.worklist.net/20049