Bug fixes and improvements on axis management