Small changes to case type selection