Misc changes1