fixed more buddy support bugs