Pushing the fixes and changes