Couple of misc fixes.