Fixed time signature issues