Bugs found by Nawal.