More configuration and fixes