Fixes working towards PR341