Fix a few more issues identified by scrutinizer.