some fixes for comments on prod