various correction (closes #4235, closes #4236, closes #4228)