Fixed Issues with re-rolling database.