Misc modifications
Misc modifications