Fixed a few comments to make it compilable again