Fixed some clock/pitch issues