Small updates on header, subscription management