Adding Fixes