Aemove fixes