Some changes. refs #434