First round of fixes from this mornings sprint.