some other fixes?