Foundation fix and copy tweaks