Misc changes

..