A few attempted fixes.