Fixed curly braces in common files