updates to fix an issue found by scrutinizer-ci