Minor updates and fixes bump to beta2