Fixes for HTML entity and YAML stuff