Fix type bugs
Bump version to 0.6.4