Fixing some things up related to log file handling