Fixes for configuration page