Merge pull request #3788 from Segrain/master

Voxfixes.
Smallfix.
Code cleanup.