Adding misc changes