Fixed several types
Merge pull request #978 from chill117/patch-1

Fixed several types