Some tweaks to the tempo placement