Changes following spec testing.