a couple other fixes