Small fixes after testing cards