Pull in updates we made on the npapi version