Port a few more handlers to the new api
Fix up logging handlers