A minor bug fixes.