fixes for recent comments