Bugfixes

Some additional fixes, together with fixes from https://github.com/facebook/hiphop-php/pull/239