Fix a couple other included packages