Fix errors in 309