Fix some Hyask coverity issues