Closed additional issues raised in layout review.