Fix issues with COM