Some bugs found by Robyn  F.