Add requirements
Fix some deprecated stuff