Fix issue: Minor buddy fixes