Build version fixes