Tighten up handler implementations