pickup point fixes