Fix axis classing issues