Additional fixes for issue #5