Added two more compiler passes