some minor cycpp fixes