Case Study Fixes