Improve Z-level tracking for LoS