Fixed bugs caused by automatic rebase of rubymine.... :-(