More UE buffer fixes