Couple syntax changes