Guideline fixes for C++

Fixes #13