Fixes some card issues

Pull requesting on behalf of mrracine