PR fix and JS fix