Couple of syntax updates