Small changes
Small misc changes