#364 post-merge fixes