Fix BorderlessButtons build errors