Fix types
Merge branch 'master' of github.com:tunnell/wax