more version-specific fixes