Updated log helper, etc