[aml] Network manager fixes, part 1