Some requirements fixes