derivative fixes