More requirements fixing