Fix starting rank issues