LP1858448 More IDL fixups