Couple more tweaks for issue #494