Merged ek newer

Fixes to problems with Jenkins testcases and compilation problem in last pull request.