More fixes for issue #554