other fixes