Fixes for gcc 4.7.2
Merge pull request #289 from thewacokid/master

Fixes for gcc 4.7.2