Fixing tempo issues