The first one was fixed in 2.1