fix some stuff HList pointed out