A few good fixes.