Fixed version number packing
Build fixes