some minor cycpp fixes
Merge pull request #906 from scopatz/pp

some minor cycpp fixes