updates to fix issue found by scrutinizer-ci