More ACG key and type corrections