Minor fixes for issue #726