minor fixes post merge