fixes for c++ language constructs.