I'm applying the fixes and then we can merge. The tests are green. The tabs can be done later.