Fixes (traccia2 is still WIP)