DF-185 Marking some methods as const