Commenting fixes