Rework join checks, fix force joining