Fixes for types to allow compilation
Merge pull request #1 from drnic/fix-types

Fixes for types to allow compilation