Bug fixes for embeddables, edge-case class names

Hiya!

Another patch release with some minor bug fixes and other minor things - all thanks to the community!

Cheers!

Changes: v1.11.3..v1.11.4