Variable sized elements improvements
Fixed a build error in Windows
merge