misc cleanup/fixes