HAVAL fixes. Closes #652.