Added fixes for Excel compatibility