Couple of small improvements and bug fixes.