More keith-vs-oss fixes