Fix build and add version