Changes to improve web build