Small fixes
Small Fixes