Fixed syntax errors caused during rebase with master