Scrutinizer fixes

Resolves #48