s2-specific fixes