Fix David bugs