Well, never commit without running your code first... :D
Fixed wrong types in constructors.