Make gem dependencies more consistent