Minor updates to log statements and global setup.