Various changes for ariesve