a few other fixes