Fixed ace issues