some other fixes