First few fixes.