Additional fixes for issue #9