Optimizing fixes