Patch 5 - hotfixes 2