Fixed some issues with subscription settings and such.