Cleaning up some log noise and scrutinizer bugs