Multiple database fixes