Fixes for old MPL, astropy