Small fixes and changes.