ATX fixes