Minor fixes

Minor fixes

Minor fixes

Minor fixes

Minor fixes

Minor fixes

Minor fixes