Fixed error 500s