reverted database fixes