misc changes i'm using in my environment