Added sematic fixes