Fixed some requirements bugs