Fixed some further issues + node 0.10 compatibility