fixes I missed when I pulled this package out of other project