Card fixes