A number of small fixes post-merge