Last fixes by Scrutinizer