Fixes for sunpy tweaks

MERGE PLEASE!