Updating few fixes