Dev scrutinizer fixes

Creating a PR and leaving open while I go through issues.