Fixed Database and site errors