Fixes for naxis > 2