fix for aogp ...and fix fetch from aogpd repo