ReqCycle fixes and improvments before switch to Eclipse