Couple of fixes and changes.