Fix the remaining issues in Bug 963816 Comment 98 & 99