Patch 5.0.5b

Patch 5.0.5b has some fixes and tweaks which couldn't be hotfixed.

Patch 5.0.5b