Misc fixes

[bluetech]

Hi, Just a couple things I encountered.

(There are a few more pull requests to follow. They all came to fruition at the same time; I'm gonna stop for a while so don't be alarmed :)

[dvdhrm]

Hi

Sorry for the delay, it's just that I was pretty busy the last couple of weeks. I pulled both fixes.

Thanks David