Some compat and failsafe for win