Fixed few configurable variables are expanded too early