Fixes, possibly broken ids