Fixes after inspection 0247aadf-d8f1-4c09-9891-daa5c4cb7fdd

https://scrutinizer-ci.com/g/scrutinizer-ci/scrutinizer/inspections/0247aadf-d8f1-4c09-9891-daa5c4cb7fdd