some minor changes for agcc