Fix Scrutinizer issues

Fix Scrutinizer issues

Fix Scrutinizer issues