Fix some raw types.
Merge pull request #26 from greboid/master

Fix some raw types.