Migrated to new version of rust compiler