various other fixes