Minor syntax adjustments after hiatus