various misc cleanups