Fixes for cardlib load order causing type_id_changed? issue