Fix for push notifications config and stuff