A few fixes and changes.