reviewer fixes