Fix some mappings
Update version