Fixing deprecations and ruby stupids