Fixed couple of old syntax issues