DB/misc: Some fix ups for Arcatraz