#29 minor fixes.