Pull in the vm.args update and some cleanup