Release 2: Added (potential) fixes