Other changes in Beta 5

🎁