Fix further invalid configuration issues introduced in 0.5.1