Initial paywall fixes