Add back things i added to 8226-common