Fix spec & hound issues