Some fixes regarding the axis integration