Fixes for working
optimization add-ons