ID to Class fixes