Small fixes
Small fixes