A few bug fixes for issues.