Fixes for Config