correct issues identified by scrutinizer