Curry - fixed compilation issues for clang