Quick fixes and update to forge 996
Redo proxies