Added more 2.6 rpm fixes