Update Ace and fix several small issues