Forgot to merge in some of the lateral changes in webpg-chrome