A coupleof misc changes