Fixed some compilation issues caused by wrong data types.
Merge pull request #1 from justusbeyer/devel

Fixed some compilation issues caused by wrong data types.