More atrack fixes