Minor updates to logging