Optimizations for NO_IE compatibility