A few misc changes