Fix few more coverity warns