more ordering fixes

Signed-off-by: Ruben Smits <ruben.smits@intermodalics.eu>