Minor syntax changes for stable/havana