Some minor misc changes