Fixed some more Excel issues