Work around for caret problems in neko/cpp

(and some other fixes)