General fixes and changes.