Make clipboard usage more consistent