another round of small issue fixes.