Fixes for the Yipfile.