Update for API changes

This needs a cleanup badly, but let's let it compile

Signed-off-by: Jack Huey kitskub@gmail.com