Added ProductVersion and fix for versioning