couple other fixes