Night Janitor: Minor bug fixes

More minor bug fixes.