Fixes some issues discovered with a log sweep