Patching for STE Hardware compatibility