Fix some issues with hruby integration