Fixes to unit lists