Fixes from Scrutinizer