some auto code fixes by scrutinizer