Small changes
Small fixes