Misc changes

Misc changes