various fixes post release