Changes for new osmium
More changes for even newer osmium
Changes for new osmium