Database fixes - need reeval