Fix few obvious type errors found with dializer

[gleber]

There's one more set of errors left, but these might require adding many specs