fix minor issues to please scrutinizer