More issue 8 updates.