Fix start angles and positions