minor fixes to make this crap compilable
Merge pull request #1 from 0x2493/master

Broken inheritance