Fix a bunch of tyops

Closes #261
Closes #259

Signed-off-by: Tomaz Muraus <tomaz@apache.org>