A couple improvements