More fixes for case