minor fixes per review comments