Corrections (tested on a fresher environment)