[UPDATES] Fixes and patches