Xray: Fix odd blocks