Minor fixes

Minor fixes