Compatibility tweaks (following initial remote testing)