more handler fixes