Fixups for small errors and warnings found on gcc 4.7
Merge pull request #48 from phy1729/fixups

Fixups for small errors and warnings found on gcc 4.7