Fix issues with separator comments