Small fixes
Fixes