Fix Laurence's bugs, again!