Fixed comments @huonw