Fixed various syntax errors associated with previous commit