Fixed non-numeric track source IDs and other minor errors