Add some config and PR changes