More six-axis fixes