Config fix and commands