FIX e4 compatibility issues