Update gems and fix errors caused by gem changes