DF-185

Minor fixes.