Minor fixes

S