Little fixes
Fixes