Final fixes for mod compat.