Small updates, ref #1360