Fixing David's bugs.

1 job for master