post-merge fixes, running now