Random fixes and changes.