A few small fixes.
Merge pull request #243 from Clashnia/hqm

A few small fixes.