Gem packaging fixes