Fixes for configuration