Fixed some legacy gems, now working