PR fixes for issue #59