Configuration module
Small fixes