Update for several changes from folsom to master