Fixes and changes.