Small fixes
Fix