Six-axis calculations fixes