Minor changes to please scrutinizer