A few misc fixes.