More bug fixes. I hate rightscale.