BAMPFA-272: handle 'do not move' case, other minor corrections