Fix forgot autofill and join cancel bugs