Fix errors while AMC changed