Checkin fixes for pasting things.