Final grammar fixes