Build fix and verbs bug fix