Fixing some issues with casing