Migrated to new rust compiler