more auto join changes