[#2178] Fixing more bad yaml references
Fixing typo
[#2098] Fixing a few minor things