Syntax corrections on base masterbranch