Fix stuff that almost broke the website