some hunk fixes