Apply fixes for Christina's next set of comments