Config reader fixes