Fixes Applied