added few COM headers and added hot fix