Fix rider bugs