Fix a couple of things scrutinizer noticed

WEBSITE-1083