[PLAT-5236] Write more meaningful log messages & call into fixZOrder