Fixes on Fixes