Minor comment and enum changes