Appear to have fixed db issues