Fixes from Scrutinizer.