Fixing Xavier's bugs.