Hotfix 1.0.7 and all fixes before.

See commits for specifications.