Fixed some gem references errors
More configuration changes