Small fixes

Small fixes
Small fixes