Aztec fixes

Discuss Aztec fixes