Comments hot fixes