Added label fixes