DB integration round 4

Minor changes to getting crew set up properly.