Fixed changes Mentioned by o11c