Migration to EAK
Hopefully last fixes due to migration to EAK