Fix gemfiles and dependencies