Fixed Database / General issues.