[#620] couple of additional fixes (Thanks Jay)