Patch 5.0.5a

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

Patch 5.0.5a