Initial config improvements.