Pull in website changes to fix recent exceptions