Fixes a few issues found with testing scalding