Yet more porting...

Signed-off-by: Ian Soboroff <isoboroff@gmail.com>