Adding fixes
Adding fixes