Minor fixes to get yank.py working again.