#558 pull fixes