few fixes for version e