Fixing issues. This fixes DB scripts and others.
#newsmute-78 In Progress