Fixes to list formatting