Fix and resolve Paul's comments