Fixes that should make it work on node 0.8