Merge pull request #411 from norv/fixes

Fixes
Oops.

Signed-off-by: Norv <a.w.norv@gmail.com>