Additional configuration and fixes.