More misc fixes.