some BZ fixes. small changes.

I don't think we need JIRA for those... fairly simple fixes