Some small fixes for the new configuration
Missed one key
More small fixes