Misc changes
Merge changes in