Small fixes
Small fix