Different small fixes after optimizations updates