Fix some issues with syntax