Error and comment fix