Fixed some imports that prevented compile