Created by: rspeicher
Fixes the two most-spammy messages during testing. See individual commits for details.
