Move jailing to after setup