Gem updates
Adopt to changes on swc