Minor fixes to syntax issues from b2a8ee172