More syntax fixes. Should have refactored.