Compat fixes for Eng