Added optimizr fixes