@  cpp/source.cpp: some fixes