Mine is the same as AJP's. I am persistent with the bedtime routine. Even if she isn't going to go to bed at her usual time, I still do everything else at the same time.
Definitely keep noise & lights at a minimum during the night. If Nina wakes during the night, I never turn on any lights, and I make very little noise.