Fix axis defaults
Some fixes