Fix some configuration-related errors