Fix configuration
Small fixes