config and bundle fixes