Fixes for wrong config entries