Updates to make site work with plugins