[DF-4684] some methods made inline. minor fixes