More requirements tweaks.