More updates to fix elog.warning calls and use elog.error