fixes that should be applied when applying patches 7,8,9,10,11 & 12 simultaniously