Several fixes (the Make-Federico-Happy-Commit):