Fix for #4445.
Fix for #4458.
Typo fix.
Smallfix.
Smallfix.
Tiny fix.
Fix for embedding.
Fix for #4479.
Merge pull request #4468 from Segrain/master

Bugfixes.