Fix for some bugs as syntax error.