Corrects errors detected by scan-build