More ace-jump changes