Small changes

Mostly committing to sync