Few minor bug fixes.