Smaller Fixes
Fixing some problems due to migration to EAK