[ticket/11] Fix scrutinizer issues

Fixes #11