updates to fix stuff from pivotal