[Added More Fixes]