Bug fixes and build version update