More usage-tracking fixes/testing