Reverts & Fixes