Add two more build packages