fixes for AM restart