Correct some issues (refs #3650)