Excel fixes for issue #229