Requirements fixes