Axis rescale. Bug fixes