Chris' fixes