Small changes
Fixes