More delimiter fixes