property fixes for scrutinizer