Minor teaks and fixes.