Updates to be compatible with astropy v0.3