Minor fixes

Minor fixes.