More fixes for case list