Cross-fixes