Reworked Fixes