ADEN-64 CR fixes