Error-case fixes and log quieting