This is a whole bunch of fixes we did

Due to these fixes are not tested in general, we need to verify if we do not break anything!