More Bugs in v4.0

Oh, I feel tired.