Fix missing property
Fix Scrutinizer issues