fixes for configuration