automt: some fixes