Fix for live db problems.
Temp for 09/10-Jun-2013