corrections as suggested by the CLang code analyser