fix some patches that are not necessary anymore or need to fit the current status quo