More handler fixes