Update requirements
WIP Fixes