More fixes, maybe it will compile some day.

Signed-off-by: David Silver <dms.silver@gmail.com>