Fix gems

Some fixes.