Fix and cleanup requirements