A couple of sticky headers fixes