More tweaks for cross and a patch