Set of fixes to handle ck path in non root directories