Some small fixes to comment based results